From 2833358294c2995cdf1159b2f06391fe37691ce8 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 3 Nov 2014 23:20:13 -0800 Subject: [PATCH] Fix some flaky tests --- tests/test_cargo_compile_custom_build.rs | 4 ++-- tests/test_cargo_compile_git_deps.rs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs index e83bbdadd..e8d83c3f5 100644 --- a/tests/test_cargo_compile_custom_build.rs +++ b/tests/test_cargo_compile_custom_build.rs @@ -741,7 +741,7 @@ test!(output_separate_lines { .file("build.rs", r#" fn main() { println!("cargo:rustc-flags=-L foo"); - println!("cargo:rustc-flags=-l foo"); + println!("cargo:rustc-flags=-l foo:static"); } "#); assert_that(p.cargo_process("build").arg("-v"), @@ -750,6 +750,6 @@ test!(output_separate_lines { {compiling} foo v0.5.0 (file://[..]) {running} `rustc build.rs [..]` {running} `[..]foo-[..]build-script-build` -{running} `rustc [..] --crate-name foo [..] -L foo -l foo` +{running} `rustc [..] --crate-name foo [..] -L foo -l foo:static` ", compiling = COMPILING, running = RUNNING).as_slice())); }) diff --git a/tests/test_cargo_compile_git_deps.rs b/tests/test_cargo_compile_git_deps.rs index 6f8089486..8d8f45ded 100644 --- a/tests/test_cargo_compile_git_deps.rs +++ b/tests/test_cargo_compile_git_deps.rs @@ -1175,9 +1175,9 @@ test!(git_repo_changing_no_rebuild { assert_that(p1.process(cargo_dir().join("cargo")).arg("build"), execs().with_stdout(format!("\ {updating} git repository `{bar}` -{compiling} bar v0.5.0 ({bar}#[..]) -{compiling} p1 v0.5.0 ({url}) -", updating = UPDATING, compiling = COMPILING, url = p1.url(), bar = bar.url()))); +{compiling} [..] +{compiling} [..] +", updating = UPDATING, compiling = COMPILING, bar = bar.url()))); // Make a commit to lock p2 to a different rev File::create(&bar.root().join("src/lib.rs")).write_str(r#" @@ -1201,9 +1201,9 @@ test!(git_repo_changing_no_rebuild { assert_that(p2.cargo_process("build"), execs().with_stdout(format!("\ {updating} git repository `{bar}` -{compiling} bar v0.5.0 ({bar}#[..]) -{compiling} p2 v0.5.0 ({url}) -", updating = UPDATING, compiling = COMPILING, url = p2.url(), bar = bar.url()))); +{compiling} [..] +{compiling} [..] +", updating = UPDATING, compiling = COMPILING, bar = bar.url()))); // And now for the real test! Make sure that p1 doesn't get rebuilt // even though the git repo has changed. -- 2.30.2